From f5fe8bef4a822a4a363120cfce8011413bfb2668 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Tue, 4 Dec 2018 00:47:36 -0600 Subject: [PATCH] Wrap (use) of variables in #defines. --- defs.h | 14 +++++++------- easygps.cc | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/defs.h b/defs.h index ecdf1a535..be6c54ec8 100644 --- a/defs.h +++ b/defs.h @@ -39,8 +39,8 @@ #include "src/core/datetime.h" #include "src/core/optional.h" -#define CSTR(qstr) (qstr.toUtf8().constData()) -#define CSTRc(qstr) (qstr.toLatin1().constData()) +#define CSTR(qstr) ((qstr).toUtf8().constData()) +#define CSTRc(qstr) ((qstr).toLatin1().constData()) #define STRFROMUNICODE(qstr) (global_opts.codec->fromUnicode(qstr).constData()) #define STRTOUNICODE(cstr) (global_opts.codec->toUnicode(cstr)) @@ -93,10 +93,10 @@ /* knots to meters/second */ #define KNOTS_TO_MPS(a) (KPH_TO_MPS((a)*1.852)) -#define MILLI_TO_MICRO(t) (t * 1000) /* Milliseconds to Microseconds */ -#define MICRO_TO_MILLI(t) (t / 1000) /* Microseconds to Milliseconds*/ -#define CENTI_TO_MICRO(t) (t * 10000) /* Centiseconds to Microseconds */ -#define MICRO_TO_CENTI(t) (t / 10000) /* Centiseconds to Microseconds */ +#define MILLI_TO_MICRO(t) ((t) * 1000) /* Milliseconds to Microseconds */ +#define MICRO_TO_MILLI(t) ((t) / 1000) /* Microseconds to Milliseconds*/ +#define CENTI_TO_MICRO(t) ((t) * 10000) /* Centiseconds to Microseconds */ +#define MICRO_TO_CENTI(t) ((t) / 10000) /* Centiseconds to Microseconds */ /* * Snprintf is in SUS (so it's in most UNIX-like substance) and it's in @@ -424,7 +424,7 @@ typedef struct { double min_alt; /* -unknown_alt => invalid */ } bounds; -#define WAYPT_SET(wpt,member,val) { wpt->member = (val); wpt->wpt_flags.member = 1; } +#define WAYPT_SET(wpt,member,val) { (wpt)->member = (val); wpt->wpt_flags.member = 1; } #define WAYPT_GET(wpt,member,def) ((wpt->wpt_flags.member) ? (wpt->member) : (def)) #define WAYPT_UNSET(wpt,member) wpt->wpt_flags.member = 0 #define WAYPT_HAS(wpt,member) (wpt->wpt_flags.member) diff --git a/easygps.cc b/easygps.cc index e6d9a6c99..9ccc226ee 100644 --- a/easygps.cc +++ b/easygps.cc @@ -47,7 +47,7 @@ rd_init(const QString& fname) int sz = gbfread(ibuf, 1, 52, file_in); if ((sz < 52) || - strncmp(ibuf, ezsig, strlen(ezsig)) || + strncmp(ibuf, ezsig, strlen(ezsig)) != 0 || (ibuf[51] != 'W')) { fatal(MYNAME ": %s is not an EasyGPS file.\n", qPrintable(fname)); } -- 2.30.2